From: Matthias Beyer Date: Mon, 23 Jun 2014 19:18:28 +0000 (+0200) Subject: Staging: bcm: led_control.c: Replaced doubled if-check by logical OR in one check X-Git-Tag: archive/raspbian/4.9.13-1+rpi1~10^2~6194^2~1325 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=a143aa2ae0598e80bee2900c5d2800850558dc1f;p=linux-4.9.git Staging: bcm: led_control.c: Replaced doubled if-check by logical OR in one check Signed-off-by: Matthias Beyer Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/bcm/led_control.c b/drivers/staging/bcm/led_control.c index 8a59115c24f4..ae49a5976c83 100644 --- a/drivers/staging/bcm/led_control.c +++ b/drivers/staging/bcm/led_control.c @@ -116,14 +116,11 @@ static INT blink_in_normal_bandwidth(struct bcm_mini_adapter *ad, if (*time > 0) { /* Blink both Tx and Rx LEDs */ - if (LED_Blink(ad, 1 << GPIO_Num_tx, uiTxLedIndex, *timeout, - *time, currdriverstate) == EVENT_SIGNALED) - return EVENT_SIGNALED; - - if (LED_Blink(ad, 1 << GPIO_Num_rx, uiRxLedIndex, *timeout, - *time, currdriverstate) == EVENT_SIGNALED) + if ((LED_Blink(ad, 1 << GPIO_Num_tx, uiTxLedIndex, *timeout, + *time, currdriverstate) == EVENT_SIGNALED) || + (LED_Blink(ad, 1 << GPIO_Num_rx, uiRxLedIndex, *timeout, + *time, currdriverstate) == EVENT_SIGNALED)) return EVENT_SIGNALED; - } if (*time == *time_tx) {